$OpenBSD: patch-Makefile_in,v 1.8 2015/07/17 21:48:40 jasper Exp $
--- Makefile.in.orig	Fri May 18 13:28:05 2012
+++ Makefile.in	Fri Jul 17 15:44:26 2015
@@ -16,10 +16,10 @@ STATIC		:= @STATIC@
 doc_files	:= docs INSTALL CREDITS FAQ GNUGPL HELP README TODO AGREEMENT remote.help
 
 FILES_TO_INSTALL := *.tcl hotmlog.htm amsn amsn-remote amsn-remote-CLI amsn.desktop langlist
-FILES_TO_INSTALL += $(doc_files)
+FILES_TO_INSTALL += remote.help
 FILES_TO_INSTALL += desktop-icons lang skins utils/des utils/base64 utils/drawboard utils/framec utils/http
 FILES_TO_INSTALL += utils/pixmapscroll utils/pixmapmenu utils/contentmanager
-FILES_TO_INSTALL += utils/scalable-bg utils/sha1 utils/snit utils/BWidget-1.9.0 utils/dpbrowser
+FILES_TO_INSTALL += utils/scalable-bg utils/sha1 utils/snit utils/dpbrowser
 FILES_TO_INSTALL += plugins utils/sexytile
 FILES_TO_INSTALL += utils/log utils/uri utils/combobox utils/voipcontrols
 FILES_TO_INSTALL += utils/md4 utils/sasl ca-certs
@@ -88,9 +88,7 @@ HAVE_FARSTREAM  := @HAVE_FARSTREAM@
 HAVE_FARSIGHT   := @HAVE_FARSIGHT@
 
 ADDITIONAL_FLAGS = $(WARN_FLAGS) $(LFS_FLAGS) ${TCL_INC_SPEC} ${TK_INC_SPEC}
-ifeq (@DEBUG@,no)
-ADDITIONAL_FLAGS   += -O2
-else
+ifeq (@DEBUG@,yes)
 ADDITIONAL_FLAGS   += -g3 -DDEBUG
 endif
 ADDITIONAL_FLAGS   += -DPACKAGE='"$(PACKAGE)"'
@@ -108,7 +106,7 @@ endif
 # build final cflags
 CFLAGS   := @CFLAGS@ $(ADDITIONAL_FLAGS)
 
-CXXFLAGS := @CXXFLAGS@ $(ADDITIONAL_FLAGS)
+CXXFLAGS := @CFLAGS@ @CXXFLAGS@ $(ADDITIONAL_FLAGS)
 
 ifeq ($(STATIC),yes)
 CXXFLAGS += -static-libgcc -L.
@@ -251,9 +249,9 @@ install:: $(FILES_TO_INSTALL) | install_libs
 	# This doesn't work if the libdir has quotes in it
 	sed -i -e 's#^set lib_path ""$$#set lib_path "$(libdir)/$(PACKAGE)"#' $(DESTDIR)$(dstdir)/$(PACKAGE)/amsn
 
-	ln -sf $(dstdir)/$(PACKAGE)/amsn $(DESTDIR)$(slnkdir)/amsn
-	ln -sf $(dstdir)/$(PACKAGE)/amsn-remote $(DESTDIR)$(slnkdir)/amsn-remote
-	ln -sf $(dstdir)/$(PACKAGE)/amsn-remote-CLI $(DESTDIR)$(slnkdir)/amsn-remote-CLI
+#	ln -sf $(dstdir)/$(PACKAGE)/amsn $(DESTDIR)$(slnkdir)/amsn
+#	ln -sf $(dstdir)/$(PACKAGE)/amsn-remote $(DESTDIR)$(slnkdir)/amsn-remote
+#	ln -sf $(dstdir)/$(PACKAGE)/amsn-remote-CLI $(DESTDIR)$(slnkdir)/amsn-remote-CLI
 
 	cp $(srcdir)/amsn.desktop $(DESTDIR)$(dstdir)/applications/
 
